Merge "registration: Overhaul merging of globals"